thermal: Fix ABI change in 4.4.4

struct thermal_zone_device is always allocated in thermal_core and the
new field is only used there.  So we can safely move it to the end of the
structure and hide it from genksyms.

Also hide the new #include, as if it could make an actual difference,
stupid genksyms...

Gbp-Pq: Topic debian
Gbp-Pq: Name thermal-fix-abi-change-in-4.4.4.patch

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index ba08b5521382890e66b14a54a5b67e7bc29c69fe..65bebc8d78ebfefaa78b6dd9324513ca0f6997e2 100644 (file)
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -37,7 +37,9 @@
 #include <linux/of.h>
 #include <net/netlink.h>
 #include <net/genetlink.h>
+#ifndef __GENKSYMS__
 #include <linux/suspend.h>
+#endif
 
 #define CREATE_TRACE_POINTS
 #include <trace/events/thermal.h>

diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index e13a1ace50e902ad0ae38a81f5563d67eaa4a00f..65481b9c1a432214d8991011ab8b6fdb49b21150 100644 (file)
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -198,7 +198,6 @@ struct thermal_zone_device {
        int emul_temperature;
        int passive;
        unsigned int forced_passive;
-       atomic_t need_update;
        struct thermal_zone_device_ops *ops;
        struct thermal_zone_params *tzp;
        struct thermal_governor *governor;
@@ -208,6 +207,9 @@ struct thermal_zone_device {
        struct mutex lock;
        struct list_head node;
        struct delayed_work poll_queue;
+#ifndef __GENKSYMS__
+       atomic_t need_update;
+#endif
 };
 
 /**